From 435eaa622f8d2994d79991b4364d33341c138555 Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sun, 6 Sep 2009 17:04:36 +0000
Subject: [PATCH] Rename GPSBabelFE to GPSBabel in many (though not all)
 places.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3781 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/gui/app.pro        | 5 ++---
 gpsbabel/gui/appname.h      | 4 ++--
 gpsbabel/gui/main.cpp       | 4 ++--
 gpsbabel/gui/serial_mac.cpp | 3 ---
 gpsbabel/gui/upgrade.cpp    | 4 ++--
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/gpsbabel/gui/app.pro b/gpsbabel/gui/app.pro
index d4625b6f1..44d27a818 100755
--- a/gpsbabel/gui/app.pro
+++ b/gpsbabel/gui/app.pro
@@ -1,4 +1,4 @@
-# $Id: app.pro,v 1.8 2009-09-02 19:05:27 robertl Exp $
+# $Id: app.pro,v 1.9 2009-09-06 17:04:36 robertl Exp $
 #
 
 CONFIG += qt release 
@@ -25,8 +25,7 @@ UI_DIR = tmp
 RESOURCES = app.qrc 
 RC_FILE = app.rc
 
-win32:TARGET=gpsbabelfe
-unix:TARGET=gpsbabelfe-bin
+TARGET=GPSBabelFE
 
 extras.commands = (make -f makeextras.mak)
 extras.target = extras
diff --git a/gpsbabel/gui/appname.h b/gpsbabel/gui/appname.h
index 82d84f15b..162531a2a 100644
--- a/gpsbabel/gui/appname.h
+++ b/gpsbabel/gui/appname.h
@@ -1,4 +1,4 @@
-// $Id: appname.h,v 1.1 2009-07-05 21:14:56 robertl Exp $
+// $Id: appname.h,v 1.2 2009-09-06 17:04:36 robertl Exp $
 //
 //------------------------------------------------------------------------
 //
@@ -21,6 +21,6 @@
 //
 #ifndef APPNAME_H
 #define APPNAME_H
-static const char *appName = "GPSBabelFE";
+static const char *appName = "GPSBabel";
 #endif
 
diff --git a/gpsbabel/gui/main.cpp b/gpsbabel/gui/main.cpp
index 849cb5aaa..63c9be9e7 100644
--- a/gpsbabel/gui/main.cpp
+++ b/gpsbabel/gui/main.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: main.cpp,v 1.5 2009-09-02 19:05:27 robertl Exp $
+// $Id: main.cpp,v 1.6 2009-09-06 17:04:36 robertl Exp $
 //------------------------------------------------------------------------
 //
 //  Copyright (C) 2009  S. Khai Mong <khai@mangrai.com>.
@@ -66,7 +66,7 @@ int main(int argc, char**argv)
 
   QCoreApplication::setOrganizationName("GPSBabel");
   QCoreApplication::setOrganizationDomain("gpsbabel.org");
-  QCoreApplication::setApplicationName("GPSBabelFE");
+  QCoreApplication::setApplicationName("GPSBabel");
 
   MainWindow mainWindow(0);
   mainWindow.show();
diff --git a/gpsbabel/gui/serial_mac.cpp b/gpsbabel/gui/serial_mac.cpp
index 9c83bea27..1c4d09656 100644
--- a/gpsbabel/gui/serial_mac.cpp
+++ b/gpsbabel/gui/serial_mac.cpp
@@ -73,9 +73,6 @@
 static kern_return_t FindModems(io_iterator_t *matchingServices);
 static kern_return_t GetModemPath(io_iterator_t serialPortIterator, char *bsdPath, CFIndex maxPathSize);
 static int OpenSerialPort(const char *bsdPath);
-static char *LogString(char *str);
-static Boolean InitializeModem(int fileDescriptor);
-static void CloseSerialPort(int fileDescriptor);
 
 // Returns an iterator across all known modems. Caller is responsible for
 // releasing the iterator when iteration is complete.
diff --git a/gpsbabel/gui/upgrade.cpp b/gpsbabel/gui/upgrade.cpp
index 7a446bce9..83d5d03f8 100644
--- a/gpsbabel/gui/upgrade.cpp
+++ b/gpsbabel/gui/upgrade.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: upgrade.cpp,v 1.14 2009-09-06 05:04:07 robertl Exp $
+// $Id: upgrade.cpp,v 1.15 2009-09-06 17:04:36 robertl Exp $
 /*
     Copyright (C) 2009  Robert Lipe, robertlipe@gpsbabel.org
 
@@ -91,8 +91,8 @@ QString UpgradeCheck::getOsVersion()
   case QSysInfo::WV_6_1: return "7"; break;
   default:
       return "Windows/Unknown";
-#endif
   }
+#endif
   // FIXME: find something appropriately clever to do for Linux, etc. here.
   return "Unknown";
 }
-- 
2.30.2